bitkeeper revision 1.1340 (426652e8h-OWfDH7vm_elbT4wtH2cA)
authormafetter@fleming.research <mafetter@fleming.research>
Wed, 20 Apr 2005 13:02:32 +0000 (13:02 +0000)
committermafetter@fleming.research <mafetter@fleming.research>
Wed, 20 Apr 2005 13:02:32 +0000 (13:02 +0000)
Merge maf46@ssh-relay1.cl.cam.ac.uk:/usr/groups/xeno/BK/xen-unstable.bk
into fleming.research:/scratch/fleming/mafetter/xen-unstable.bk

Signed-off-by: michael.fetterman@cl.cam.ac.uk

Trivial merge